Stop referring to ClutterTexture

ClutterTexture is removed from mutter's clutter fork, so lets stop
referring to it. This also happens to fix an incorrect type cast.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/822

diff --git a/src/shell-app.c b/src/shell-app.c
index 33d5ec3a7a67f86f9c24937a5f34b6b8d0084100..14ebfc40d07b42cca63be1acab537ae03fe2b79d 100644 (file)
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -223,7 +223,7 @@ window_backed_app_get_icon (ShellApp *app,
 /**
  * shell_app_create_icon_texture:
  *
- * Look up the icon for this application, and create a #ClutterTexture
+ * Look up the icon for this application, and create a #ClutterActor
  * for it at the given size.
  *
  * Return value: (transfer none): A floating #ClutterActor

diff --git a/src/st/st-drawing-area.c b/src/st/st-drawing-area.c
index f561759c6236af7d9c29c7fcfdc0adb3036fa33f..38085a9015af02696f860ad1eecbdce8cb964c24 100644 (file)
--- a/src/st/st-drawing-area.c
+++ b/src/st/st-drawing-area.c
@@ -22,9 +22,8 @@
  * SECTION:st-drawing-area
  * @short_description: A dynamically-sized Cairo drawing area
  *
- * #StDrawingArea is similar to #ClutterCairoTexture in that
- * it allows drawing via Cairo; the primary difference is that
- * it is dynamically sized.  To use, connect to the #StDrawingArea::repaint
+ * #StDrawingArea allows drawing via Cairo; the primary difference is that
+ * it is dynamically sized. To use, connect to the #StDrawingArea::repaint
  * signal, and inside the signal handler, call
  * st_drawing_area_get_context() to get the Cairo context to draw to.  The
  * #StDrawingArea::repaint signal will be emitted by default when the area is

diff --git a/src/st/st-image-content.c b/src/st/st-image-content.c
index bf4c5bfc5dabbf07aa70784d2295cd3bbe996058..0b379c4bbb1919899a75b8ca85431711ab650912 100644 (file)
--- a/src/st/st-image-content.c
+++ b/src/st/st-image-content.c
@@ -146,7 +146,7 @@ st_image_content_get_preferred_size (ClutterContent *content,
 {
   StImageContent *self = ST_IMAGE_CONTENT (content);
   StImageContentPrivate *priv = st_image_content_get_instance_private (self);
-  ClutterTexture *texture;
+  CoglTexture *texture;
 
   texture = clutter_image_get_texture (CLUTTER_IMAGE (content));